Merge Android10 QPR1 into AOSP master am: d3e2bc19cb am: 6ce1e4a7b5

Change-Id: Ic149a563cc81cf20ccf5c0f25bd38ca09d3854a6