[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Keyboard shown after...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Keyboard shown after force stopped app package" into rvc-qpr-dev am: 61d14581 am: 5d9e4855 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idfc331653290b11d6e9280328fed9248a48321c9