Merge "Remove un-needed supplyPin supplyPuk APIs without subId specified." am: 1e3299eb34 am: f98d45bfaf

Change-Id: I0f0d71585d6a76ea3d5af828be97fe7321e44de4