Merge "Grant VTS tests all permissions in keystore on userdebug/eng"