Merge "Frameworks: Move SharedPreferencesImpl to tristate"