Merge tag 'android-11.0.0_r34' into r

Android 11.0.0 release 34

Change-Id: I8e0f59950437b703ec2290c11f35889311c15a05