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

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

Change-Id: I3005a83ba8d27238d2fbd883d77b4a20432cabc6