Merge "Move battery usage files to a separate folder." into tm-qpr-dev am:...

Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953ea am: 6470ada1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446



Change-Id: I3d6a155e80a5d54c309061c41d0b6436e61cc4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>