Merge Android10 QPR1 into AOSP master
am: 47454c56de

Change-Id: I6415310fb3ecb080bfcf0ba99203dfa43aee68fb