Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: If27af71b6cadaaceceac1573913889a9ff8d1f20