Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I02ff250b4fb612a4b88e91a4bb0ef469adf30bc4