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

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

Change-Id: Ie12fb48d3d17f6299ecc8be2000bc8e9142275aa