Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev