Merge "Add netd and connmetrics into telephony dump" am: c1ad9fb654
am: fcaf4ba4c7

Change-Id: I946fcfdf2da27838cf78bb61ef891a0aaedb73cb