Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-03" into nougat-cts-dev
am: 5736e5010e  -s ours

Change-Id: I2e1b68f31c592e4e164aad276ae1f93295205fe8