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

Change-Id: I50a40c0f00e65cb0efbd475a999e05c06d07a8c6