Merge Android10 QPR1 into AOSP master am: af8a319569 am: 9a65750022

Change-Id: Idfd7b25987e6e1df2323b0141f08e8fb0e9a3768