[automerger skipped] Merge "[SM06] Collect mobile NetworkStats metrics by...

[automerger skipped] Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 1db5f59d am: 1596f034 am: 6331cb53 am: f4cc5a05 -s ours am: fc95013e -s ours

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

Change-Id: I6c897e0a2c253d97e87bb065aec7e77f614924be