Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29
am: 2d28e0372a  -s ours

Change-Id: Ib8dfc0f08e2086b0161d9c7ad122103a95e1a709