Merge "Add a bitmap version for get/set PreferredNetworkType" am: d25bffff74 am: 8af0650ece
am: 45791a3457

Change-Id: I85cfda3c776d7d9fbe237807612bb7ebc8ab63b3