Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I6f6dee8e1f5931eeb4e69c685e44fd88bf1e7cba