Merge "Fix wrong ime parent in embedded activity" into udc-dev am: fb499317

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



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