Merge "Add dock defender battery tips" into tm-qpr-dev am: f218f350

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



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