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

Change-Id: I84c59b69b0a3af80f8a2cac830bfc53467eb1740