[automerger skipped] NormalBrightnessModeController structure am: ac0d75f2d2 am: 96cac29ca9 -s ours am: 127839b408 -s ours
am skip reason: Merged-In I738151e3cb269f3408db731e8edeced59535c3cc with SHA-1 ac0d75f2d2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23606557
Change-Id: Ief338c854868208bb0189bb0336f3b5e8a7b24e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: