Merge "Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am: bf9b1dbb66 am: 22df0a5ae2  -s ours" into oc-mr1-dev-plus-aosp
am: 9f7d0ba789  -s ours

Change-Id: I430b6f818765e7ef705b1269f2feb595281f7118