Merge "Adds stripTrailingFs" am: 27bb333e14

am: a91491a3b8

Change-Id: I6b850d252fb40395bc312f4ed8be383153af52ef

telephony/java/com/android/internal/telephony/uicc/IccUtils.java

@@ -836,6 +836,13 @@ public class IccUtils {
         return new String(new char[] {HEX_CHARS[(b & 0xFF) >>> 4], HEX_CHARS[b & 0xF]});
     }
 
+    /**
+     * Strip all the trailing 'F' characters of a string, e.g., an ICCID.
+     */
+    public static String stripTrailingFs(String s) {
+        return s == null ? null : s.replaceAll("(?i)f*$", "");
+    }
+
     /**
      * Converts a character of [0-9a-aA-F] to its hex value in a byte. If the character is not a
      * hex number, 0 will be returned.