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

Change-Id: I7365dbd9e69c86f84ad88c78ad0f24c2c8f16986