Merge "Persist the nit brightness for the default display" into tm-qpr-dev am: 049f8dc0

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



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