am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs