Merge Android 13 QPR2

Bug: 273316506
Merged-In: I405dea123f5503fdc063ac88930a50b56ab4953b
Change-Id: I86bfafde97123117eb1706e5bfb544037d7384f9