Merge changes from topic...

Merge changes from topic "cherrypick-config_batteryStatsResetOnUnplugHighBatteryLevel-v9xw8cq20i" into udc-dev am: bd44515f

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



Change-Id: Id709e124e352d284c4b6e6c9819c37a8bb8eceb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>