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

Change-Id: I78a9d01c4e91cfbf8d6703d1c2c15590d0d72fa4