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

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



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