Merge "Add a bitmap version for get/set PreferredNetworkType"