[automerger skipped] Merge "Revert "Extract network observer code from NetworkManagementService."" am: 9fdc6d2963 am: 04f4e4ed88
am: 1c073368f5 -s ours
am skip reason: change_id Ib4e7da3274e49f25676505a08e6ce7e7b0dfdb8d with SHA1 9ebc3fc82f is in history

Change-Id: If41fd9c044de94607c60ddf7684dd683034c560c