DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: Ic7c1bcb7afbd1c076a06400e05fa6352372ef3e7
diff --git a/ServiceManager.h b/ServiceManager.h
index 399c413..8f0c83a 100644
--- a/ServiceManager.h
+++ b/ServiceManager.h
@@ -91,8 +91,7 @@
     bool addImpl(const hidl_string& name,
                  const sp<IBase>& service,
                  const hidl_vec<hidl_string>& interfaceChain,
-                 const AccessControl::Context &context,
-                 pid_t pid);
+                 const AccessControl::CallingContext& callingContext);
 
     // if restrictToInstanceName is nullptr, remove all, otherwise only those services
     // which match this instance name. Returns whether all instances were removed.