Merge Android10 QPR1 into AOSP master am: ec915d7645 am: be07a2d3b0

Change-Id: Ic095addf3e592972ab2078675ec299b28d671f5d