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

Change-Id: I5d4d61ac5c923581d3557b801a133ea342f26bc3