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

Change-Id: I48914526d7bc15bab52838d34ba60aa4afd981b9