Revert "Tweak Modes layouts and use updated strings to match mocks"

This reverts commit 0359aaeb47e66b1d7eda4e1291aaf7ef5d280627.

Reason for revert: <Potential culprit for b/356564046  - 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: I980838773078d822d20608e5975a26cf8dbed2be
11 files changed