Merge "Removes dependency of NotificationEntryManager on IStatusBarService."