Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Ia0a181c328abc9bfb7c972a55e8cdaa7387846c7