Merge "Clean up framework brightness system" into sc-dev am: 2bb1f86a17

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

Change-Id: Iaeb3d421888359b0d0957103c3bf32ba8c4f8d06