[automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e am: c702fbbc -s ours
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d is in history
Change-Id: I6373b613d7555c796ceaed8469e57ddcc4d5fe60