Merge Android 13 QPR2

Bug: 273316506
Merged-In: I732861692946d1aa6bef2c6798f00c98d52ed6d6
Change-Id: I670853ed6d49a6ec4d136112fee32d7856e785e4