Merge "Fix BatteryStats counts foreground activity time." am: 982daf25b8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958912

Change-Id: Iff15e0f1ddadcc6eae16962bb82197d8db5bc894