Merge "Add manifest service attribute foregroundServiceType"