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

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

Change-Id: Iee3a1549af6e97cf9e5696df0cd1cba8eec7eff7