[automerger skipped] Merge "Update new owners for battery pages." am: c2c5de61 am: 9e3bb702 am: 227d74be -s ours am: e71853e6 -s ours

am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08ea4022a74fcc0dd327dc3691ec599e6e4f9e6f