Merge "Replace hidden API startForegroundServiceAsUser"