[automerger skipped] Fix the MMS messages toggle preference not working am: b377713547
am:ac3b465e96
-s ours am skip reason: change_id Ida65d04b095b7d2556fa5bdd93be7a67cba77206 with SHA1054e0eab87
is in history Change-Id: I8fbd43096c78d21848e8d7856e44b9590d95f576
This commit is contained in: