Merge changes from topic "cp-networkscan"

* changes:
  Remove NetworkClass from TelephonyManager
  Add Network Preference Bitmaps