[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: 7beb30b6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9ffe8f905124156617254cc29373f65640ea98a2