Merge "Make NetworkAgent stop subclassing Handler."
am: a11ae54bee

Change-Id: Ie308e86e1b1173b0ec7fb7ac4a4f0b6c2bcfafa6