Merge "Add multiuser support for enabling notification listener" into oc-mr1-dev
am: e98975db32

Change-Id: I37a3c63c256dcb69eb75b75bde4d6f97a0b7622b