Merge "Revert "Extract network observer code from NetworkManagementService."" am: 9fdc6d2963
am: 04f4e4ed88

Change-Id: I75e37fb6e8681b2f64831ddc2dade382426e4859