Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-05...

Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18 am: 67038159 am: 6e74bc34  -s ours am: 6004c810  -s ours am: 9c8b857a  -s ours am: 690b7e90  -s ours am: bac9a626  -s ours am: b4682b1f am: 2f9c66b7" into oc-dr1-dev-plus-aosp
am: 85e6742c

Change-Id: Ic376a89388cd7eb3a3493537de4e98bacdbf0b10