Merge "Remove usage of IccCardConstants hidden APIs"
am: b181ba61e2

Change-Id: Id24383c88deff304c7fbbc0a4b6f95019bf35283