Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Ibea539f965d6933c6b708ecdc7e22b5e055fe5d0