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

Merged-In: I0b367368946f7147acf241c5a88b8f31e4ba7f13
Merged-In: If7ae2cfd8e8ebaacf0154328c0fe5fa9b90d2355
Change-Id: Icb8a72b0fd537c913b4f6fc48ee9aec6f5f844d5