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

Change-Id: I3255e43713c84d961be6b13eb05d1dad34937739