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

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  -s ours am: 50efec7a  -s ours am: df338dad  -s ours am: a94af85a  -s ours am: 4149340d  -s ours
am: b81e890e

Change-Id: I7b822b8a3fe4c3fd1f0221ad54c331e69b621c97