Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev am: 9a8d84b8ed
am: ec439b54fb

Change-Id: I54c898d6a0d0dd5edc4ecbd6a069741079aaa3ea