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

Change-Id: I36549e11aa66b4c25e7bc778c2a24ae556ac454b