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: I01ebf16126dcfffa1568b91def0a7bc1b13d8f79