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 am: f686b8e219
am: 87aa71a0d6

Change-Id: Ia39c79a77dc17a3535ea7f36fb5278ef4abdfaa5