am 4eeb8ad4: am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent." am: 3b6f820e6b

Original change: undetermined

Change-Id: Ia46e40cdcc6921b8c97ce0bc10f8f1ae6bed829e