Merge "Fixed attaching nav to app not working for notification case" into sc-dev am: e356c06b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14185025

Change-Id: I23f53b85be0e4b3a33f24e1ad68c6e1170181521