Merge tag 'android-10.0.0_r23' into q

Android 10.0.0 release 23

Change-Id: I9025ff4d66b3dc8b04dc70b3eae12e3643a79e02