[coastguard skipped] Merge sparse cherrypicks from sparse-9946294-L35000000960520556 into android12-tests-release.

COASTGUARD_SKIP: I1b2c317e21db118e4b957804feb76f266d887b20
COASTGUARD_SKIP: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6
COASTGUARD_SKIP: Ie45a24d782b7322c65b995b9e09b9f1135061db9
COASTGUARD_SKIP: I77e0706f413ce9defb174f00ee145dcc01f5d780

Change-Id: Iea74277f52e11d3ea9dbb2a632b1e4965d92e752