Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I7edc13b58425cc78f8d99344cdffc49202b784ca