[automerger skipped] Merge "Fix wrong ime parent in embedded activity" into tm-qpr-dev am: 4c10cba683 am: d0bcc0fb1d -s ours
am skip reason: Merged-In I937560f7479535f0e2dc77ebe0f5056fa85bbb04 with SHA-1 fc837a1811 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21534052
Change-Id: I7fd419a74ff7adaef1d214b7188b07bbe7133a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: