Merge "IdleMaint: run IdleMaint if battery is charging" am: 8f7a935713 am: 775aeb22d2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453295

Change-Id: I7626a12f055c9bb2c91a8406db4581a82dd53ba9