Merge "Tests for android.preference.Preference"