[automerger skipped] Merge "Remove un-needed supplyPin supplyPuk APIs without subId specified." am: 1e3299eb34 am: f98d45bfaf am: b7b18b80a8 -s ours
am skip reason: Change-Id Ib1dfd606420b78ac9bf6305aca0a707a64d0f731 with SHA-1 da56b3cf86 is in history

Change-Id: I0f843a7c0d075722d1e61c6ac9723e8112afbf0f