[automerger skipped] Merge "Use permission com.android.settings.BATTERY_DATA"...

[automerger skipped] Merge "Use permission com.android.settings.BATTERY_DATA" into main am: 51fe6894 am: 5998074b -s ours

am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d12 is already in history

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



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