Merge changes from topics "lte_ca_support", "ss_provider"
am: 8dedf2b5e4

Change-Id: I3cb0bad3aa3c6b24b79709c507739baab670c044