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: f8cb90cf

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



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