df11959779
This reverts commit 6f9a57186c.
Reason for revert: A Bug where only device preferences were being used, not the main shared preference file.
Bug: 269569568
Test: Verified this on device.
Change-Id: I8422b2d7073537bd46c3a91033bd2281bbd306b7