am 43589647: am 870ba83b: am 8dd8818b: am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev

* commit '43589647ab13b61deb3424f40219338cf32097b8':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch