Merge "Adjust cancel back navigation conditions." into udc-dev am: 67182c20

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



Change-Id: I6ce721595c0c352e14768baf2527a7f101240ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>