Update metering unit selection to use smaller units for time

Update the unit selection to not convert to a higher unit until
the max value is at least 2 units.

Change-Id: I349b328b553ed634a70b70b695d4db92295c9b67
Closes-bug: #1384248
Merge "Update metering unit selection to use smaller units for time"