The settings crash when it add the RTL mark on MEP message am: 7de5f998 am: eae57aee

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929



Change-Id: I7d902cab024759e0b680a24f65521cdecb6d214c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>