Merge "Update extra defend layout string" into tm-qpr-dev am: a0c76c92 am: 20e92716

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



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