Merge SP2A.220405.004 to aosp-master - DO NOT MERGE

Merged-In: I0e5c20ee2bd16c18cc0124812156cb8da6a0b274
Merged-In: I8913e9b31a07070687f9b025bfa260e84d47b36f
Change-Id: Ia9e7b2aa38e980f04e490915f40099b05000758c