Merge "[RESTRICT AUTOMERGE] Fix Keyboard shown after force stopped app package" into rvc-qpr-dev am: 61d14581

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

Change-Id: Iee8234c98f944d1bf5acb109da4eb199c010dee7