Merge tag 'android-10.0.0_r46' into q

Android 10.0.0 release 46

Change-Id: I3c6532432c6e0f9e9e3d03b4f98db2c876fbd427