Merge "Merge "Report brightness event to StatsLog" into udc-dev am: e618d251...

Merge "Merge "Report brightness event to StatsLog" into udc-dev am: e618d251 am: 0924e433" into udc-d1-dev-plus-aosp am: 20a4d48a

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



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