Merge Android 12 Bug: 202323961 Merged-In: I435267199a30b921b02e9ee11c8aab6e56d8d988 Change-Id: I04b2c2a297f86f5769fdf1bf57304277d7016e03