Merge "Mark some system intents as SystemApi"