[automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 am: c702fbbccc -s ours am: bb25e17d43 -s ours am: 1421fce9d9 -s ours am: 8849909a58 -s ours
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32 is in history
Change-Id: Icf2cb47019a751a2ffb0ab29e2cc3ad3b5c85503
This commit is contained in: