Merge "Netd unconditionally enable bandwidth control"
am: 75fb51b0ec

Change-Id: I58af9d801bae5e5128ba2debbb5fe865366ae77f