Merge pull request #17839 from cvan/updated-mkt

Bug 989470 - Fix MCC/MNC dual SIM detection in Marketplace app
r=julien
(cherry picked from commit 5d81c713215ee1b97996e0bedff87dcd14309eec)
Merge pull request #18068 from julienw/989470-v14-marketplace-package

Merge pull request #17839 from cvan/updated-mkt