Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Idf59a52fdc74034813ce48a7ed2c35d097a7ca92