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

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

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



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