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

Change-Id: Iee1cbda7eb4cee9b34e7d9cb4577f3cf8902aa69