[automerger skipped] Break layout context before and after bidi control character am: 83ac416c72 am: ea4020c609 am: 89be2bb8f3 -s ours

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

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

Change-Id: I919b6bc454655d399bf83ab06f38ef4f1b5018b7