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: 486626b5

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



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