Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a
am: c4a501ce0f

Change-Id: Iaebd3fb1a299396d79ac5a9499bb9151d496e598