[automerger skipped] Merge "RESTRICT AUTOMERGE: More improve IME transition during task switch" into sc-qpr1-dev am: 32efa155f4 am: f92a2ff176 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3220db1f4a15883bf25443ac185f6b6736c12a73