[automerger skipped] Merge "RESTRICT AUTOMERGE: More improve IME transition during task switch" into sc-qpr1-dev am: 32efa155 -s ours am: 5172ef70 -s ours am: 3cb123ca -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id24094ce4717617df26fcacb3ef49bdcb9b18ab4