Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev am: 5bb8294f92
am: 936a32b455

Change-Id: I4762207a20f5c047ceabad659b88c63761c457d0