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

Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: I4826d32c3aae06b61a992985d127320efbe96289