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

* commit '479c482ca1788235afc776125eb6a79f1d9281c8':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs