Merge "Add missing public statics to NotificationCompat" into klp-ub-dev