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

Change-Id: Ife3c7d26402bfa62dd8a6e6bcbc8608caa526970