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

Change-Id: Ic1566785ba2efae73469729f70b43775af02e57c