Merge "Clean up framework brightness system" into sc-dev am: 2bb1f86a am: 39d49003 am: 1bb18344

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

Change-Id: Ia8ed00111c09859be650152ccec2f085772fa966