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

Change-Id: Idbfd80b32c27cfd2d24b37b5b868820e6ed7a283