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

Change-Id: Iffff10dd426f956a4a99b3177b0e4863e532c70e