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

Merge "Revert notification haptics to previous patterns" into sc-dev am: a0927a9a am: cd6ace83 am: 367579f2

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

Change-Id: I87a2b494878901f8c94cd3e0ff96f75523c48fe5