[automerger skipped] NormalBrightnessModeController configuration am: 609b475b0b -s ours am: 530ec27bff -s ours am: f99181e9de -s ours
am skip reason: Merged-In I8681d009336d22206db355e6a18a79bc89c39603 with SHA-1 2d467a4d47 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23653845
Change-Id: I3259791b8cd91c70e2a03f9fbc9f378607c8c31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: