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 am: 60d883d0

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



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