frameworks/base: fix duplicate provisioning intents from merge