Merge Android10 QPR1 into AOSP master am: c6765102db
am: 51712cc0fd

Change-Id: I0dbc34c1fd61a741a9b3f924cb1d7676c432306e