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

Change-Id: I37bedda77be7b9d832da8dd4e9efeab714ac8d66