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
am: ec5d8daaa2  -s ours

Change-Id: I0a5f84f39984aab6ca8e0eeb7aad725d722f96d0