Merge "Instantiate correct Impl class in NotificationManagerCompat for API 14+ devices." into klp-modular-dev