[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-config_batteryStatsResetOnUnplugHighBatteryLevel-zmiab0332q" into tm-qpr-dev am: 8b1b61c5 am: 29bbfcec -s ours am: 47480516 -s ours

am skip reason: Merged-In If0db995ffaf4866bbadc828a0ade37a10da91553 with SHA-1 a14e0f5e is already in history

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



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