Updating CTS Security Patch to 2017-05 on mnc-dev am: c2903633e6
am: 6bd3769491

Change-Id: I34ea13366db410b8d3804ceaed42c873f4b81400