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

Change-Id: I87cc2d1dc8485ec628566f46e6283519ec970e10