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

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



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