Merge tag 'android-10.0.0_r23' into q10.0

Android 10.0.0 release 23

Change-Id: Ibc8fcc9eb7bc6d7b6d5ee91f40dda59c946b3087