Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I5a65313b57eebc617c8c8805df8b6c9967f2fdd2