[automerger skipped] Break layout context before and after bidi control character am: b9e1737405 am: f706737e1e -s ours am: 29319b3bf8 -s ours am: b5271b3126 -s ours am: 4c3937cb51 -s ours am: d89b0679fe -s ours am: 8d11442e3a -s ours am: b4ab129c3c -s ours am: 1efbe702fc -s ours am: aafa2e264a -s ours

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

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

Change-Id: I0121e581280a7eb571717a86dc589016f9cc5727