Merge Android10 QPR1 into AOSP master
am: f75bee769a

Change-Id: I2e734b9895a136710186d4d678ba46e7d6e4c0b8