Merge "Adding a flag for enabling new haptic components in the brightness...

Merge "Adding a flag for enabling new haptic components in the brightness slider." into udc-qpr-dev am: 45eb321d

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



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