Merge "Do not override finish activity behavior on back event" into udc-dev am: 4381f324

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



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