[automerger skipped] Merge "Persist the nit brightness for the default...

[automerger skipped] Merge "Persist the nit brightness for the default display" into tm-qpr-dev am: 049f8dc0 am: 5a5f28de -s ours am: 1a7ef798 -s ours

am skip reason: Merged-In I20a0a686ee1e4e945fbcd99d5b996534f8ef93b7 with SHA-1 2c841b19 is already in history

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



Change-Id: If3f946a1872daddca2d7b3d324262bb2e3abf569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>