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

Change-Id: Iaa9ac8d03ac0f235bbff7bf4b17ef7de6b90c24a