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':
  Break layout context before and after bidi control character

Change-Id: Ie7b3a8fadd57a73b368e20703f9f9495d2008a50