Merge "[Companion] Fix notification access dialog being in new task" into oc-dev am: 2eacbac8c3
am: 374044ff3b

Change-Id: Ied48b78eee41b1a802d1eb701adc992d9521e6d2