[automerger skipped] Merge changes from topic "NormalBrightnessModeController"...

[automerger skipped] Merge changes from topic "NormalBrightnessModeController" into udc-d1-dev am: c9b1c893 -s ours am: 21f321e1 -s ours

am skip reason: Merged-In I8681d009336d22206db355e6a18a79bc89c39603 with SHA-1 2d467a4d is already in history

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



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