Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I8170cf8b2a963e3f47239c752bff7c1b842ae592