Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I23442717f11726126e36161f636d6261972df251