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

Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5  -s ours am: c0d2cfb8 am: 214aeaef  -s ours am: 451a9d73 am: d3789031 am: 35f0f8df am: f01d7163  -s ours am: aec34cff am: 8f46ad2d am: 29c817a6 am: dbecffb8 am: c7040501  -s ours am: 6ac9ecd3 am: 05eed82d" into oc-dr1-dev-plus-aosp