[automerger skipped] Merge "RESTRICT AUTOMERGE: More improve IME transition...

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

am skip reason: subject contains skip directive

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

Change-Id: Ic50381e64f897c6cff919bd84fa04f5199955abb