Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18 am: c06523741c am: 3d615d4e16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918 Change-Id: Ic28195a4e2f7703683a77e329f9c8ba56a9cde4e
This commit is contained in: