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
am: 87589b0faf

Change-Id: I2fd3754ca068edc5d0e4a79fcc5f17290a40431d