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

Change-Id: I93eca47ffff730f9a7e535ca0d58ab869dc8596a