Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03 am: 4ab30bc502
am: f113fe294c

Change-Id: I620835e63f499c8e1b8260b5b1414f84d3286eba