Merge "Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev am: 0ef33bcb am: 315a1e45" into rvc-d1-dev-plus-aosp