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

Change-Id: I8e993cc1179eb065da593e84106f54aa3462998d