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