Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Id2755f6dc0c8f76a01bb2579204148d02f29bfc5