Merge "CTS test for Android Security b/130024844" into rvc-dev