Merge tag 'android-10.0.0_r46' into q

Android 10.0.0 release 46

Change-Id: I8faee938c58ea99e67757219d7b892743d6eade5