[automerger skipped] Merge "Fix incorrect dock defender banner icon." into...

[automerger skipped] Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev am: 72490ec1 am: a08c9db9 -s ours

am skip reason: Merged-In I084c9cd52a408efa3b9aeee96a0af0cae481ec79 with SHA-1 52323128 is already in history

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



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