Merge tag 'android-security-11.0.0_r49' into int/11/fp3

Android security 11.0.0 release 49

* tag 'android-security-11.0.0_r49':

Change-Id: I2b94d901daceddf9467229e048c53866d583cd8f