Merge "CTS/STS test for Android Security b/36591162" into nyc-mr2-dev
am: a87a94fe95

Change-Id: I98b6044355f37877cb998a5e9952d1710049efd2