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

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

Change-Id: Id60e0ccace817a2e3dd899b7616e8865544b039e