Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Iec8a9a50cab2dafc05d3456b8762236b43c654c9