am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev

* commit '418f4ed077ee0559e7f61b8ea10d53e9784fd631':
  Round charging indication to nearest minute