[automerger skipped] Merge "Clean up useless defender dialog code" into...

[automerger skipped] Merge "Clean up useless defender dialog code" into tm-qpr-dev am: 2d30eaa3 am: 0c5e243f -s ours

am skip reason: Merged-In If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6 with SHA-1 a725bac6 is already in history

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



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