[automerger skipped] Merge "Persist screen brightness setting through upgrade"...

[automerger skipped] Merge "Persist screen brightness setting through upgrade" am: 2a747f00 am: a333c1fb am: 83791181 -s ours

am skip reason: Change-Id I2a3b996c8747e3c5f1d181bbdd438c70bf23d08b with SHA-1 af6cd6dc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf41f9a047cf315ba2f22c96768193b7db1510e9