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

Change-Id: I66c099a31934d5e49ca96f20d1e2f6c1a11b6f6c