[automerger skipped] Merge "Add dock defender battery tips" into tm-qpr-dev...

[automerger skipped] Merge "Add dock defender battery tips" into tm-qpr-dev am: f218f350 am: eb565adf -s ours

am skip reason: Merged-In Ib6c09df056744142f42f5e2a13252b58e54c7534 with SHA-1 8d11d9ce is already in history

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



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