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

Change-Id: I57d52d5831e51a90c35bb3e9ca01ac5cf5e78046