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

Change-Id: I08da454829489d51ae109ad20ee67aa705f9dcc2