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: c05fedc4" into udc-d1-dev-plus-aosp am: 4188d7ef

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



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