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

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



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