[automerger skipped] Merge "Make NetworkAgent stop subclassing Handler." am: f1449b0ba5 am: e348a88aeb am: e6e3a87c74 -s ours
am skip reason: Change-Id I79478ceff6bbcae879d1025098d177de0d15dbee with SHA-1 c58ecd5f33 is in history

Change-Id: I9f190f10f21094aadba865ce8e987f75e071aa05
tree: af9b1a7eb46794a20613f0f22fd090e28ed77a53
  1. core/
  2. services/
  3. tests/