Merge Android10 QPR1 into AOSP master am: 47454c56de am: 50f10035ca

Change-Id: I3510cc4dea9cc68e5fc8ca81a0293f4281bbce27