[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: 9e310df1 -s ours am: 7cd0f0dd -s ours am: 2e2c2534 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3eb02197fefdb788d2b80d128be9dc490a4d1fde