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

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



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