Merge Android10 QPR1 into AOSP master
am: 8aa7ea5495

Change-Id: I12bd4a27c54011434e9ab99b341dc7a031610641