Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Id306d29c942fc2155709c1bf6faaf6ebb4005626