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

Change-Id: I8a493d381a8f016ba1fe30e09e6624dc21f5c11c