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

Change-Id: I5209009c77680828d57b2178e3209b20c37f029d