[automerger skipped] Merge "Make NetworkAgent stop subclassing Handler." am: 54a2e5c268 am: 69e810b6e6 am: 83fc3dc0a2 -s ours
am skip reason: Change-Id I79478ceff6bbcae879d1025098d177de0d15dbee with SHA-1 df43b6f77a is in history
Change-Id: I9f190f10f21094aadba865ce8e987f75e071aa05
This commit is contained in: