Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Idc57455180a9c257b1d72ee8b8d4056d1364131b