Merge "Strip trailing F in UiccSlotInfo"
am: 0c3f91daa3

Change-Id: I8c76ac250aa2bceab1aa1f207454d51a8d3cb091