Merge "Measured energy for Ambient Display in BatteryUsageStats" into sc-dev am: 863e3fee2b am: a6f36ac2bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13556589 Change-Id: I083987241a2aacc49054d677cf368135e6416504
This commit is contained in: