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

Merged-In: Ic3e8c89ef9571af2b88516911f0fe1238a2eb847
Merged-In: I3d3f56108117d0b8b8e97e8463ea6e2b64a80cb5
Change-Id: Ie464199869ae378a3a2ce66f5ced5db46ac6ad8d