Merge "sf: Allow SystemServer to set the display brightness" am: 9861ecb7c8 am: 22cf144ad3 am: c8c9bc3c84

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2259832

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