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

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



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