Merge "Remove IMS Emergency Calling Availability API" am: 4f00f7900d
am: 3b88e6b41e

Change-Id: I1c170eb5418ecb274d6c7f65c236831bd483a4c2