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

Merged-In: I5b82304c263471ac5803af5c71a172761933ba21
Merged-In: Icb05ecb13d83af39b1595826401476c3e9616bf8
Change-Id: I873c139c6668bebc5fa19b187f83dff889198d1e