[automerger skipped] Merge "RESTRICT AUTOMERGE: More improve IME transition during task switch" into sc-dev am: d92e142ac4 am: 9e310df136 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id8344731c215ac22c3ebc38fc7917b9813734945