Merge "Supporting independent back nav while task embedded" into sc-v2-dev am: c3a85ce0

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

Change-Id: I78011888d8cf38dde79b9604c7300ee2631cb390