Merge "RESTRICT AUTOMERGE: More improve IME transition during task switch" into sc-dev am: d92e142ac4

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

Change-Id: I43b8cbbfacf2dc8a0cb2901e632e0175bf96e633