Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I6a819189ce8ddb2c94f1d780af33e0b6e3cf9e4f