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