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: d4cd689c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17166624



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