Merge tag 'android-11.0.0_r34' into r

Android 11.0.0 release 34

Change-Id: I8632abb7c6da91863a0f66e1c9267b7ac7449997