[automerger skipped] Merge "Hide SoftInput when INVALID_DISPLAY" into...

[automerger skipped] Merge "Hide SoftInput when INVALID_DISPLAY" into sc-v2-dev am: 0b4f292d am: 4183637e -s ours

am skip reason: Merged-In I3ab03667c28ec5beb6c3332aceaae4a63cd7309a with SHA-1 d41ac060 is already in history

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

Change-Id: Ib8893e6b59cb6dfcb4ce2873da8a317609659c3b