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

Merged-In: Ia5ff62e79443b233dfcc6d2d5e405b25cde73503
Merged-In: If1d9eaee9b265d94a1d79a94f56395924239df75
Change-Id: Id5e1f7a24cfb33a320b4b4a435034d6e71e1a26e