Merge changes from topic "role-mainline"

* changes:
  Deprecate RoleControllerService related system APIs.
  Move role into module.