Merge Android10 QPR1 into AOSP master am: 47454c56de
am: fd3d0614b7

Change-Id: I239a24879a7922fe99eafc9bcf1cbc6d9d0eba45