Merge "Frameworks: Clean up SharedPreferencesImpl" am: 572f46a3ef
am: 70da38960c

Change-Id: Ia4c24c8cd6fbeb58a90d56319558fc3c78474c2b