Merge tag 'android-10.0.0_r31' into q10.0

Android 10.0.0 release 31

Change-Id: I141082894a30e2e3ba4ad4e716a1e13ca6ebcb79