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