Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I6f51a1820f5bda747a99d9d8a8313aae5d9f479a
Change-Id: I14b3237eea18dedad0893aae5b99e45c429db8d6