Merge the 2021-02-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Break layout context before and after bidi control character

Change-Id: Idaa6885d7f2da0350f1b213ea6920ad3d20b9316