Merge "CTS/STS test for Android Security b/34624155" into nyc-mr2-dev
am: 90dd34f465

Change-Id: I7ed3567113e7e6200399dbe218aeb034175faa05