Merge tag 'android-10.0.0_r40' into q

Android 10.0.0 release 40

Change-Id: I0ff606a6315e832cde4b6468dc571d7ad758d1d4