Merge "Update battery saver haptics mode" into udc-d1-dev am: 9dcfdf8e

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



Change-Id: I9631605e8ba7c83f8569a42e7ad4c8148a36f94a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>