Merge "Persist screen brightness setting through upgrade" am: 2a747f002f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75a7feb9ec86baf2a588c1187ec2632be64beaf0