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

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

Change-Id: I84c94c82005a1d21c033d6550582341d434b4a77