[automerger skipped] Merge "Adding new strings needed for Enable MMS toggle." am: 3c6cb98ec0
am:bb95bb5f8b
-s ours am skip reason: change_id If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c with SHA13b5a28e2e9
is in history Change-Id: I46da2ddc9e596575d5d7a012c9dab50fa3ee8cb1
This commit is contained in: