[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 am: 693a9e42 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4c047c5b57207fcb05feb5d3cc84713117e1b9e3