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

Change-Id: I5a8974d8cd5d2af70996ec60eae924ddd435c840