Merge "Add a mechanism to log battery usage periodic job events" into...

Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev am: 4ac05f8c am: 5c046f1d

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



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