Merge "Merge "Add dumpsys network_stack version" into qt-dev am: 8600673c am: d4b1d7a6" into qt-r1-dev-plus-aosp