Merge "Add an adapter to bridge ECC data and emergency dialer UI" am: f9dd100b1b am: 1fb8cd91d1
am: 1a57459542

Change-Id: If7ce9e61eef4203f623353ae625ca9f3c96d2729