Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Iff8f01185ac10136a5aac5085498a96b63efece2