[automerger skipped] Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 1db5f59d am: 1596f034 am: cf266434 am: 0c5e20af -s ours

am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 c82dfeb4 is in history

Change-Id: I15e032fcc2de1e2afa02b67ba6f14603aa7ed859