Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Ie2c617a7c418e7d651ee491b6ec546bd2fa1a40a