Merge "healthd: allow override of wake interval timing" into cw-f-dev
am: a1be7d1bb5

Change-Id: I5f8518d908d6ec1cc5b9a40d0e62a31fa212c517