Merge tag 'android-10.0.0_r40' into q

Android 10.0.0 release 40

Change-Id: Ib69f6ff2a5752fab93be775ac3d71bc736b3f1ea