Merge "Compare with oldSoftInputMode after restoring softInputMode" into rvc-qpr-dev am: 6a1829d14a am: b95d91a1ba

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

Change-Id: I3fd81eb8a739cc2bb55f23ab49a4ab27d62bced6