Merge "AndroidManifest.xml: More protected broadcasts"