Merge "Change foregroundServiceType from enum to flags"