[automerger skipped] Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev am: d553d434cd am: 7a7a55c1a4 -s ours am: c44f5915c0 -s ours
am skip reason: Change-Id I05bedbee641f087de5ee1b25a00724ce2de51f87 with SHA-1 4e2071ae78 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12153212
Change-Id: I8b840cf31258108a41c81af2072915e007bc2cb8
This commit is contained in: