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

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