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