[automerger skipped] RESTRICT AUTOMERGE: More improve IME transition during task switch am: 5c233013 am: 1fb73329 am: d84c3ac7 -s ours am: 2f7ba3dc -s ours

am skip reason: subject contains skip directive

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

Change-Id: I06eb48b5840400a6f99a49a89d6d7834a8b33b68