[automerger skipped] Break layout context before and after bidi control character am: a8095398b6 -s ours am: 3b951e7359 -s ours am: 4ecbb2fb09 -s ours am: 73da283d2e -s ours am: be025b856b -s ours

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

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

Change-Id: I4e91e70e54c909a9b33d34581fc10acd5c999b31