Merge Android 12 Bug: 202323961 Merged-In: I38da9f192d57688b1b05bb2bf41ce33f87a60807 Change-Id: I0d6f006a77e78f9bf1b08847b434d224208b6763