Emergency API review

1) Remove 'current' in Emergency APIs
2) Hide getEmergencyServiceCategoryBitmask,
   and keep getEmergencyServiceCategories

Test: Treehugger
Bug: 122368381
Change-Id: I158874201a7ed8427cfe4ac4c4f39abe01217a37
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 9e40ffe..2c860f8 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -877,7 +877,7 @@
         }
         if (!isEmergencyNumber) {
             TelephonyManager tm = getSystemService(TelephonyManager.class);
-            isEmergencyNumber = tm.isCurrentEmergencyNumber(mLastNumber);
+            isEmergencyNumber = tm.isEmergencyNumber(mLastNumber);
         }
 
         if (isEmergencyNumber) {