Merge "Fix dial emergency call redial issue by China Unicom." am: d9c7b957e3 am: fc6894c9c7
am: d16dfb5dfd

Change-Id: Ibe08ba87c8a606b2b40355510072887e99838ffb