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

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