Merge "AndroidManifest.xml: Remove two obsolete protected broadcasts"