Merge "Merge "Update BrightnessSynchronizer Logic" into tm-dev am: 5b0c795a...

Merge "Merge "Update BrightnessSynchronizer Logic" into tm-dev am: 5b0c795a am: ff52fa4d am: dcd623f9" into tm-qpr-dev-plus-aosp am: d38f24e4

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



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