Merge "Add get/set PreferredNetworkTypeBitmap"
am: 0beb397fa5

Change-Id: I2f03626693d9e933b92f51e8b02d0a977cb202a6