Merge "Null check for logicaldisplay" into sc-dev am: fca58882 am: 3030b865 am: 7e6cf830

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

Change-Id: I34b25a406b45e00d7a76aee25c72c345f40fabc6