[automerger skipped] RESTRICT AUTOMERGE: More improve IME transition during task switch am: 5c233013 am: 1fb73329 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibde552dfbdfdf0c8d86583d723d198f56c7c2a34