Merge "Remove RuntimePermPresSvc#onRevokeRuntimePerm"