Merge changes from topic 'am-5efdd8bbd86a42118789e95a7f0799a6' into oc-mr1-dev-plus-aosp
* changes: Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am: cb423e42 am: f0613cda Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b am: 4c535d55
Loading
Please register or sign in to comment