Revert "Fix "Dock defend string and tips in settings are incorrectly" issue"

This reverts commit d1114107.

Reason for revert: Likely culprit for b/349578829  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I905a439c73e120efa094f097d59f68d0bedb0648