Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I4a45c18c3ee945f3603921c60d0762e44e686688