Merge "Fix wrong ime parent in embedded activity" into tm-qpr-dev am: 4c10cba6

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



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