[automerger skipped] Merge "Update new owners for battery pages." am: c2c5de6199
am: 9e3bb7026c
am: 227d74be02
-s ours
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I374fc14a6caa59f3d09cfa421cb84cb582f1c1a0
This commit is contained in: