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

Change-Id: I314d9bfa7d29eb506fa4bb7faedd7f8d506098b4