[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb

Change-Id: I47bb8aef3b52eaaf5c99b4d28dc127c5a3970490