Merge Android10 QPR1 into AOSP master
am: 7a58116346

Change-Id: I0beb0759ab8449c46f0f191dedb83781d024e546