Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I1e87c3ae6dcc88effbd4cb626e599218627e04d3