Merge "Grant system_server access to debugfs_rpm"