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

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

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



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