Merge Android 12 Bug: 202323961 Merged-In: Idab7f31e09a61a61ef343855801e3bd7de7efd29 Change-Id: Ic0dcc6c4c45ca12feb9781ea68f98038d7e224ca