Merge "CTS/STS test for Android Security b/35644510" into nyc-mr2-dev am: b6f8507a88
am: 2f6113bbd3

Change-Id: I5d24d2d734584030c3df74f71a3de2151c95b8c5