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

Change-Id: I74acd77221995f6c92c004fdec6e97e059a4591f