Merge "Merge "Add namespace to battery name." into udc-dev am: 0b05e0b1"...

Merge "Merge "Add namespace to battery name." into udc-dev am: 0b05e0b1" into udc-mainline-prod am: ca3c85aa

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



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