Merge Android 12 QPR1 Bug: 210511427 Merged-In: Id5bc2eca540bc13ab44c52cda5bf2e637614ae59 Change-Id: I4056399d48897cf77ceb570ece36f01039a50aa8