Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429 am: 7a58ff0c94 am: 590dbe143d am: 71b1a4d8ea  -s ours am: a80c186e97
am: 38b24d03b5

Change-Id: I7d2228b403f83f71a8be76684c8b2dc751828264