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

* commit '91bd87699137a4ec9f4dc249592401005303f945':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch