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

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

Change-Id: I366be751ad1a8184dd6f6e1680a5af1c34d655c9