Merge "Convert IResourceManagerService to stable AIDL"