Merge changes from topic "am-ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master

* changes:
  Merge changes from topics "lte_ca_support", "ss_provider" am: 8dedf2b5e4
  Passing ServiceState as byte array into ServiceStateProvider am: 2d9b4faedc