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

Merged-In: Id6156b3469ffc23b171415d792cf48c9db9634c2
Merged-In: I92ba4bd46f2671c0bc33a71631ce1b0290198c67
Change-Id: I58ae017dde7870b2c97e1eaca0ce12d5d887bb8b