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

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



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