Merge tag 'android-11.0.0_r36' into r

Android 11.0.0 Release 36 (RQ2A.210505.002)

Change-Id: Ib5cdaf186577e6fec0f0cf0d454d5ec29885bd96