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

Merged-In: Ie576c97a153d1766407492a52e502bbe385dfcf3
Merged-In: I92c1e11f281e2865244b95fee92af887e5e9a9b4
Change-Id: I42c99a25ba2a708fc03527c6a8c82dd8f25f196d