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

Change-Id: Ie643ec6a1c917aa2d9364dbc431121f19a8a7e31