Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I0c8f863c2ad5a8185b020c2b3ec5ec9d0a89a148