Merge "Fix BatteryStats Screen On timer reset" into sc-dev am: 1e1c864b am: dea12351 am: a390d5b4

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

Change-Id: Ied00694bd34c53c89ac67a3d0fad643baacb32ff