am f9cfae24: Merge "Remove inline access control in service_manager."

* commit 'f9cfae24123bae199a07bee2dd1c307906c6e6d0':
  Remove inline access control in service_manager.