[automerger skipped] Fix NPE during dumpsys ethernet am: aea0136d01
am: a8ed3da6b5  -s ours

Change-Id: I45e174b56cc74e5427d83b51b9153c15217315a9
tree: de535f49f870036a4a93399b1e986baee08c8745
  1. service-t/
  2. Android.mk