[automerger skipped] Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant" am: 23019528ec am: a4c3162339 am: f47a64b59d -s ours
am skip reason: Change-Id I40cbcdfb8e77b3e01968d008f4359790c4264539 with SHA-1 15e3ae071a is in history

Change-Id: I16665d1b951e43e0366eb0e98cb8ae08685b408e