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

Android security 11.0.0 release 50

* tag 'android-security-11.0.0_r50':
  OOBW due to incorrect error handling

Change-Id: I816933c651d061634827070341b31c28d65c4bb7