[automerger skipped] Merge "Remove QQS brightness controller" into sc-v2-dev am: 411deb3ac2 -s ours

am skip reason: Merged-In I63501bf573e006f52379192b7b766283fea40dda with SHA-1 32b7c35f24 is already in history

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

Change-Id: I64d23b68ea18ee5a6baac45f31cbe70ac5ed1774