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

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