Merge Android 12 Bug: 202323961 Merged-In: I20324e8e87e3b6a942317b79f74d6919f7ead230 Change-Id: Ib0f961137401358ca3bb2fdf35c178500d0fc2ca