Merge changes from topic "am-81c620851fa141aaa28dc766c861df78" into udc-dev

* changes:
  [automerger skipped] Merge changes from topic "cherrypick-config_batteryStatsResetOnUnplugHighBatteryLevel-zmiab0332q" into tm-qpr-dev am: 8b1b61c532 am: 29bbfcec6a -s ours
  [automerger skipped] Add config to control BatteryStats reset logic am: ebd856f4d7 am: 38b3bf055f -s ours
This commit is contained in:
Automerger Merge Worker
2023-02-22 18:42:28 +00:00
committed by Android (Google) Code Review

Diff Content Not Available