Fix EmergencyInformation ListPreference TB issue am: b297778131
am: cd1091267e

Change-Id: Icd28bcd377012c2c6a746edb92d034c8983df318