Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I0ee6537a166333d364a2fef61cbf08dfaf00cfb9