Merge "Frameworks: Move SharedPreferencesImpl to tristate" am: 5edae415b0
am: 75dc3e9cf4

Change-Id: Ifbe406bda739b3689ca9ed95493a8eca7a9276ae