Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I5f2709fe99602dba388fe64727a04d786ba0a12f