Merge "CTS/STS test for Android Security b/36604779" into nyc-mr2-dev am: 8e7183ec4c
am: 40c3f2b44d

Change-Id: I0c5c2ab6585ac11fd3b9a30ff8f94ca000dc7f93