Merge "Merge "Prevent bad intents from crashing sysui" into sc-v2-dev am: 08d6bcbd" into sc-v2-dev-plus-aosp