Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev
am: 5c021503c6

Change-Id: I8f6b62b6ed8e5170b6558d7d21155f3e31665b6a