Merge "Port lux and nit mappings from device config to display specific...

Merge "Port lux and nit mappings from device config to display specific configs" into tm-qpr-dev am: 9babfb43 am: 5b7bf787

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



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