Merge "UserHandle.getAppId() before check if system uid" into main