Merge "Fixes the touched activity not getting focus in AE" into udc-dev am: d7e96cf6

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



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