am cff4b18e: Merge "Perform idle maintenance when the device is charging." into jb-mr2-dev

* commit 'cff4b18eeb35c832d0d48ca539ec722d9159ec70':
  Perform idle maintenance when the device is charging.