Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I735334a3584a79ae1efc555ae866f49a5fe9e109