Merge tag 'android-11.0.0_r34' into r

Android 11.0.0 release 34

Change-Id: Ie86562dfad414f7aaba67db183a7c1b2454a97b3