Merge "API for notification listener for Companioon apps" into oc-dev
am: 01c0630e81

Change-Id: I5aab5f6760b327fec244ea8ebe10fccc3e3bbbf1