Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev am: 72490ec1

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



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