Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev am: deca8f381d
am: e38beb27b7

Change-Id: Iae81a9e18ea540d35697fc4b64ee455ee8658660