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

Merged-In: Iedf680eec5cc52617d70c78fda694e87f75c9a7b
Merged-In: I1a9b4ff527c51a1d8c3e4fb40873666a3a9768ed
Change-Id: I554510f017eea35808ed1c0b2b545822930b90c7