This reverts commit 527261db5cb0c81de395cd40071b58ecdd4596b2.
Reason for revert: I'm not sure that this should have been merged; it removes support for focal, and that's needed on the 2.4 branch; thus this couldn't be a clean cherry-pick to the stable/jammy branch.
Change-Id: I5b53d552961d39bda91ef97f425123c1bab7e349
23da3d2257