Merge "Frameworks: Clean up SharedPreferencesImpl"