Merge "RESTRICT AUTOMERGE: More improve IME transition during task switch" into sc-dev am: d92e142a am: 077adb99

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

Change-Id: Iccfbef8e01718204f74f5a5bded33254b9b4d412