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

Merged-In: I8888b538b6e9bf993ed2c7613c49e144466bcf71
Change-Id: I777b85212e1b0356b8df6e233181c467509a269c