[automerger skipped] Merge "Break layout context before and after bidi control character" into rvc-dev am: 33e59c6733 -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/+/12887640

Change-Id: Icd7850198b540766720d2e0dc2cf327a8ea08a7c