Merge "Do not override finish activity behavior on back event" into udc-dev...

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

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



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