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

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

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



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