Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b

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

Change-Id: I195b2215ba250f7831de87d6b325560712fa8112