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: Id3a55e7064149782153f95bdb08ccf4c6fda477b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>