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

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

Change-Id: I7f15d11eb86f622463f68bb7a7038e58e4d98273