Merge "Save foreground_service and cached consumed power in battery usage slot...

Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev am: 7e92664f

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



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