Merge "Merge "[Companion] Fix notification access dialog being in new task" into oc-dev am: 2eacbac8 am: 7688cbc1" into oc-dr1-dev-plus-aosp