Merge tag 'android-10.0.0_r31' of https://android.googlesource.com/platform//hardware/qcom/display into q

Android 10.0.0 release 31

Change-Id: I7ab0b52fce17a840bdc2354d11af2bb4a7529ad0