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

Change-Id: Ibcb992519fc57f6e257dced49b78283d5aca39c5