Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I014737299623005d39158edb65f9f7e19c4423f0