Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I5d4ce122ba88291691f6a8058b5b0181ad02763c