Merge "Remove wtf if no display nits mapping exists" am: 92e34479

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



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