Merge "Fix the IME flicker when the launching activity in fixed-rotation" into...

Merge "Fix the IME flicker when the launching activity in fixed-rotation" into udc-dev am: 11e07670 am: fd10274d

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



Change-Id: I10445b86bf74357f7b09038d30582c85e146e760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>