Merge "Bug fix for back arrow behavior." into udc-dev am: 8061467c am: 2d1bbbcb am: c0791d8d

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



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