Merge "Add managed profile whitelist to control NotificationListenerServices"