[automerger skipped] Merge "Make NetworkAgent stop subclassing Handler." am: a11ae54bee am: 4fae98e083 am: 3c6d43cf7a -s ours
am skip reason: Change-Id I79478ceff6bbcae879d1025098d177de0d15dbee with SHA-1 782b48d567 is in history

Change-Id: I9f190f10f21094aadba865ce8e987f75e071aa05