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

Merged-In: I92ba4bd46f2671c0bc33a71631ce1b0290198c67
Change-Id: I9f61cd1e3a3feebf6fc2aaa020e65a8909662712