Merge changes from topic "wear_small_battery-master"

* changes:
  Revert device idle timing changes for small battery devices.
  Removing watch specific DeviceIdleController logic in favor of small battery device flag