Merge "Call AgingHelper.onNotificationRemoved in Assistant"