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

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



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