Merge "Make PreferenceInflater call setAccessible on constructors" into mnc-dev