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

Change-Id: I68aa377b98b330ad7050538c47728d4ff728410e