Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: If21a698952834cbfb820864a159888673f0f2bf7
Change-Id: I03be97cc4b1254e3585633e9a808cfac2d8cf9ef