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

Change-Id: I9289b586b2aa28590dde1cdc90d21a45c4a27dbb