Merge "Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am: 24b0486cdc am: dd51fb20f3 am: 15f24a36d5" into nyc-mr1-dev-plus-aosp
am: b6533c3207

Change-Id: Ic5354cf764424754964a3b75f272145602f2c8d0