[automerger skipped] Merge "Remove QQS brightness controller" into sc-v2-dev am: 411deb3ac2 -s ours am: ff8763620b -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: I8193dc31149089c3a587d5ff1a0bf98a1f46db89