Merge "Fix that holding volume buttons to activate Extra dim feature doesn't...

Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev am: 277ed260

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



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