[automerger skipped] Merge "[RESTRICT AUTOMERGE] add normal brightness...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] add normal brightness controller config" into udc-qpr-dev am: 4144ff4d am: 2692f13e -s ours

am skip reason: subject contains skip directive

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



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