Merge pull request #21268 from ferjm/bug1028398.fxapermission

Bug 1028398: FxA will silently provide user's email to privileged apps i...
Conflicts:
	apps/settings/manifest.webapp