Merge "Merge "Remove IMS Emergency Calling availability API" into pi-dev am: 4f59dce0f8  -s ours" into pi-dev-plus-aosp
am: 3afebb7f4e  -s ours

Change-Id: I6c19a0f1f4843e84f23868bd04099895c89dca9b