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

Merged-In: I5e11fdec669da196c60acdebf0bb40404d85f03c
Merged-In: I04152035d96dfaffd745acca04f46b124fd14b88
Change-Id: I243228b419a69d8edf753f77737322f15842e47f