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':
  Cherry-pick one upstream patch

Change-Id: Icc46b573a637c8518dc1fa788512d21772cf0dcb