Merge Android10 QPR1 into AOSP master am: 5c9a169305 am: 5a871ad3b8 Change-Id: Ic255d4192270ec3c449ddafc74045a985bde871d