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

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

Change-Id: If138a44407ab2e8d4669b2d7a5ef7fe30459a9d2