Merge "Merge Android10 QPR1 into AOSP master" am: 2a9ddbb108
am: 5af5b037db

Change-Id: Ia6ef910a5d17f1cf28e80503d2f9e12103350ca0