Merge SP1A.211105.004 to aosp-master - DO NOT MERGE

Merged-In: I6c9dae2628641dedc3f83194fcc729d1b1be3baf
Merged-In: I01ac0a313afc92ea0116f541b1a92c21c2b90a39
Change-Id: Ice02a046cdd95bdcf1fdc2bda22d3776efec1712