am bb852b0b: Merge "Format ListPreference summary with empty string if entry...
am bb852b0b: Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev
automerge: c4a12a7a
* commit 'c4a12a7a':
Format ListPreference summary with empty string if entry is null