Merge "Remove ResourceManagerService AIDL api versioning"