am 222eec2e: Merge "Handle naming for system uids running as secondary users"

* commit '222eec2ecfc4afcbd5cf0f08e16f69f6c3c424fa':
  Handle naming for system uids running as secondary users