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

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

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



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