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

Change-Id: If919c336906d3b426e4f57551271ccea457d333b