Merge "Adds API to query emergency over MMTEL support" am: 784ecfcdc5
am: eaa45b103b

Change-Id: I24683e701ef83b5b10794501e4f1c9f26fb5ee1b