Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Ia69fe4178aca4d61c873ee877470e8a2d73a2d86