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

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



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