Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Ie2f49b6c4d38ccb7bb0c04098943b069be2edded
Change-Id: I6db537b04fb44dc8a7fe728084344f2d84915aa4