Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Ib47d84ab5134f577c0bd8b61fa16e9c7255a5508