Merge pull request #8862 from evelynhung/issue-836276

Bug 836276 - remove "alert-sound.enabled" and "alert-vibration.enabled"(cherry picked from commit 14567d8d55078d74085208a794cac1db206f782a)

Conflicts:

	apps/settings/index.html