Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am: cb423e42b3 am: d9cc31d158
am: ec0e69cd8f

Change-Id: I44c9ffcfaa92c9b2a5f60c201fbab49e9fc569a7