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

Merged-In: I2c71a33c1b161d7ca236cbf2435290a7401c1920
Change-Id: I6b41258b594ad7a4d12e79df66366d74603ada0d