Merge "Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev am: 0ef33bcb35 am: 6b2c843091 am: dbd8b13a2d" into rvc-qpr-dev-plus-aosp