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: e9e08812 am: 9fbcdb92

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



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