Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev
am: 00d83ea50f

Change-Id: I9228a7b79f4c8f438fceb462128d16eddda2b563