Merge changes from topic...

Merge changes from topic "cherrypick-config_batteryStatsResetOnUnplugHighBatteryLevel-zmiab0332q" into tm-qpr-dev am: 8b1b61c5

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



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