Merge tag 'android-10.0.0_r40' into q

Android 10.0.0 release 40

Change-Id: I5e21fbf09a917c6fcc60ea3969ee3e05ac135502