Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I5ddedf3792803d247fc9e083d77a5a2458f7efbf