[automerger skipped] Break layout context before and after bidi control character am: 8bb556e04a am: 2196551595 -s ours am: 8926b623c0 -s ours am: 9901cbd8c4 -s ours

am skip reason: Change-Id Ibcff6f3b7fcb7fefa2acb7f52446cf4b4547a4a2 with SHA-1 83ac416c72 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/12895865

Change-Id: Ie130f7c3406cea2325794bffc71fa27158b1a83b