[automerger skipped] Fix the MMS messages toggle preference not working am: b3777135
am: ac3b465e -s ours
am skip reason: change_id Ida65d04b095b7d2556fa5bdd93be7a67cba77206 with SHA1 054e0eab is in history
Change-Id: I8fbd43096c78d21848e8d7856e44b9590d95f576