Merge "Support exposing getNetworkSelectionMode"
am: 2ac8306365

Change-Id: I83b91a4022f6e9ce9729822af00bc1724b1feaf2