Merge Android10 QPR1 into AOSP master am: ec915d7645

Change-Id: Ifbe750126126cdc0a99833c643bc9fa8ddebf2d6