Merge Android10 QPR1 into AOSP master am: dd964bfe0c
am: 1b97c6e8ba

Change-Id: I15fd5bf6fa3e4cd6b3acc4f2d19a75f8b24a9b2d