Merge Android10 QPR1 into AOSP master am: af8a319569
am: 13b6f89e32

Change-Id: I33975f17640c1089ece7da38d2832f2d798056fe