Merge "Decouple network_sampling frequency from VDBG" am: a6c732ff4b

Original change: undetermined

Change-Id: I5cc3186d534bd1beabf9007f7a0da4668f9ac6fb