Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I6ff1cfa7d46b2df2870cc680ec7729ec130feb2a