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

Change-Id: Ic061e0647d108df6fd4837b89555febd5f85b48f