Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I44665cdbcf6205f55ada21ea562a0f2e20e231fd