Merge "Require N for preferred SIM query"
am: ed6893eb40

Change-Id: I422ef37a9f3be66807e2e995a6902bd31067ee32