[automerger skipped] Merge "Commented out NETWORK_TYPE_LTE_CA in logging function" am: 599866e91f am: 36aa46b9f8 am: 720a58f07c -s ours
am skip reason: Change-Id If5714d147c583e5d76a35d3f215ce818129f8e3d with SHA-1 25dcad3f59 is in history

Change-Id: Icefab5e15a3cdca89a70964f827866098e806039