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

Merged-In: I83a494f9ce81abcaafc401f950aa49d6435842e5
Change-Id: I6a75d103893390cf8f22341da00c4aae65abeebb