Merge "CTS/STS test for Android Security b/35645051" into mnc-dev am: 7f0ea9259d am: b55034688f am: 81580aa941
am: a10da1b3ef

Change-Id: I007d321f697890ede1f7e9ab227f635c8800bc49