Merge "Revert notification haptics to previous patterns" into sc-dev am:...

Merge "Revert notification haptics to previous patterns" into sc-dev am: a0927a9a am: 73adcbb6 am: 93525c55

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180071

Change-Id: I1466c33a25c9280480dc454d47023cc10b1c0f9b