Merge "Add config to force display to transition to off after doze" into...
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am: cb423e42 am: d9cc31d1
am: ec0e69cd
Change-Id: I44c9ffcfaa92c9b2a5f60c201fbab49e9fc569a7