Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I210c8a66a288452356f5c5f9b9066eb9c2366599