Merge "Secretkeeper: move VTS to rdroidtest" into main