Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I5bf4b923e5bf107104c3d3f16074d7394bad5734