Merge Android10 QPR1 into AOSP master am: c6765102db am: 73ef60476a

Change-Id: I03446c2475165752b6ff9048d5d7da715c72db11