Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I879eb9219649abdbe2d2686adc692e835eab7997