Merge Android 12 QPR1

Bug: 210511427
Merged-In: I7b1ca7d71f18b16fa6db39ba556eb1106746c83b
Change-Id: Idf19957f7c93b9af400aad6ec434a94f54d85b5e