Merge "8974-system.prop: Enable netmgr QoS Flow Control"