[automerger skipped] Merge "Consolidate clearing...

[automerger skipped] Merge "Consolidate clearing mImeInsetsFrozenUntilStartInput" into sc-qpr1-dev am: 9ae4d14f am: 8fa168d6 -s ours

am skip reason: Merged-In I796754992911b917a49fcd18f22019c1eecad908 with SHA-1 5d580797 is already in history

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

Change-Id: I052fc0af53f250b42cfb76adb4396a87d6dc76ff