Merge "Merge "Compare with oldSoftInputMode after restoring softInputMode" into rvc-qpr-dev am: 6a1829d1" into rvc-qpr-dev-plus-aosp am: 4058be1e

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

Change-Id: I94322c107ab669cbef4ec37ff3a6676f843d5da1