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: I8d8c8fd65a1e48978e72c54895f6876dc6e21508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>