Merge "Add apex-system-service tag to AndroidManifest."