Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
am: 65347f07ce
am: 902ece0ba3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758 Change-Id: I8b04f23c9ec4299833e34be24ba981d7df79e270 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: