Merge "Persist the nit brightness for the default display" into udc-dev am: 708f98b6

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



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