Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
am: 59dd2ebfc1

Change-Id: I2ad78ef36e3c459308bb201d0798e8af3d55f2eb