Merge "Fix the issue of increasing brightness with KEYCODE_BRIGHTNESS_DOWN event" into udc-dev am: 4c30ffa6 am: 691adce8 am: f73e62ae

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



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