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

Change-Id: I55a48ace893bf04f1fdacfd1724731208cc4aba2