[automerger skipped] Merge "[Tether09] Use INetd to call netd directly" am: a3e62b2c3b am: 083cbd73b9 am: c038aff5e9 -s ours
am skip reason: Change-Id I4ab0ad387d4bd1773ff94d3b380c1720df07f8d5 with SHA-1 a9d9ef8783 is in history

Change-Id: If07124dcaf25a927ad4f7b844814cc29cc8f03b0