Merge "fix uid for ForegroundServiceStateChanged"