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