Merge "CTS/STS test for Android Security b/37469795" into lmp-dev