Merge "Fix the issue of increasing brightness with KEYCODE_BRIGHTNESS_DOWN event" into udc-dev am: 4c30ffa6 am: 45ccf3de am: 7e9e3d75

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



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