Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I125210955787687ae79b508517a5a516ab0dfe2d