[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
am: 83709d3152
am: 70ea788dfa
skipped: ac14372129
am: 83c448128c
am: 50abbfdb53
am: 00a67ddab1
am: 2afc690751
skipped: 49f77737a2
am: b0aa7c342a
am: a26a50ba69
am: 2d955bd781
am: 90b42aa3db
-s ours
Change-Id: I7a794b7d11e41d8e73b050f1292d9b6b0df6400b
This commit is contained in: