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 am: aab57c01

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



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