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 am: c15b2e85

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



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