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

Merge "Revert "Port lux and nit mappings from device config to display specific configs"" into tm-qpr-dev am: b1819cde am: d673cc0c

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



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