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

Change-Id: I02dff846aafd787ad0b324092f147129d666536d