[automerger skipped] Merge "Flags for brightness slider" into sc-dev am:...

[automerger skipped] Merge "Flags for brightness slider" into sc-dev am: 0ac1939c am: 049bbaa9 -s ours

am skip reason: Change-Id If29f81a0089df6f0cc790fd140890eaba9359903 with SHA-1 4a18d1f1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I365c49c33baca8a9da2c5a9b4b90d1afc5dc5739