Merge tag 'android-11.0.0_r36' into r

Android 11.0.0 Release 36 (RQ2A.210505.002)

Change-Id: I087d6eb3bd477cc7e0e1a6328e2e7b6008dda9e9