Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I55e610a7c8f083a580035fd2b14de74dd43429dd