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

Change-Id: I2399b0336772742ef3afb34df393d96bb5a37a08