Merge "Fix IME layering target above IME surface" into sc-v2-dev am: 175672ccef

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

Change-Id: I5a350fbfb5bfb77e2c90b426002c3fb23d697444