Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f9

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



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