Merge "Null check for logicaldisplay" into sc-dev am: fca58882db

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

Change-Id: I1bf201b3d9e0cec56c22388a0d2a2a4118fac524