Merge "Add a new feature provider for Battery info page" into udc-qpr-dev am:...

Merge "Add a new feature provider for Battery info page" into udc-qpr-dev am: 70c89004 am: bd47587e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308379



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