Merge "CTS/STS  test for Android Security b/30593752" into nyc-mr1-dev am: b238474ed3 am: 3b939e75db
am: 2b16d1270a

Change-Id: I27242eefabcb88234365e68c3e9a3a99354ad79a