Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
am: b8ff97fbd5

Change-Id: I559aa49ff0ef4aa82a6a1fb989d05c81ac7575fe