Merge "Merge "Updating CTS Security Patch to 2017-06 on mnc-dev" into mnc-dev am: 43e940a082 am: 8b0e642413 am: 5e77ff481b am: 536c5864e9 am: e8b915f3fe am: d513a4bfb7 am: a242a1a703 am: cf95930426 am: 5ec8bedc27  -s ours am: 4ca3a503fb" into oc-dev-plus-aosp
am: 910f5a1c40

Change-Id: Ic0376f203f026dd489682beb220e10b4217e8489