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: I8e57e7c5c2f14e0447a7677e64ee8ddfae54f4d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>