[automerger skipped] Merge "RESTRICT AUTOMERGE: More improve IME transition...

[automerger skipped] Merge "RESTRICT AUTOMERGE: More improve IME transition during task switch" into sc-dev am: d92e142a am: 077adb99 am: c122bef4 -s ours am: 4a3fa200 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia6a2a21d105e627c14955bc4358c4abb23b5c546