FP2-1335: Inconsistent layout clock widget

Use system battery charge/discharge estimates instead of custom ones.

Change-Id: Ie01dfc5c72c12f22bcbbe5b41628849c4466d96e
3 files changed