Merge "Update DozeServiceHost with new method" into tm-qpr-dev