Merge "Merge "Fix NPE in DisplayModeDirector.isDozeState()." into sc-dev am:...

Merge "Merge "Fix NPE in DisplayModeDirector.isDozeState()." into sc-dev am: a8547003 am: c0434990" into sc-qpr1-dev-plus-aosp am: 17c1f2fb

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

Change-Id: I88e2d48d717e2ab7b58f7b38a1479974b10c13f7