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

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

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



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