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