Merge "Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev am: 0ef33bcb35 am: 315a1e45b2" into rvc-d1-dev-plus-aosp am: f7d6b97b4a

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

Change-Id: If0a112684e37d7ad6b68eec86c6d1f0fcc0f46c4