Merge Android10 QPR1 into AOSP master am: 54e964b29c
am: b81934c4af

Change-Id: Ia4a0cfd99af5cee5201eaa444b5bb74870a967f4