Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev
am: a246e378c4

Change-Id: If4d89287dd72bb074ef348ee41bb59f88f05ca5d