[automerger skipped] Merge "Add idleEnabled to brightness event logging" into...

[automerger skipped] Merge "Add idleEnabled to brightness event logging" into tm-qpr-dev am: b456bec0 am: 241d2a4e -s ours

am skip reason: Merged-In I255396f132497ba42b60261de1477231520dad3d with SHA-1 1720e655 is already in history

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



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