Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25
am: fbd8bcf329  -s ours

Change-Id: Iab67b2fdd9aac710472268edba1be79161b6e554