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

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



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