[automerger skipped] Merge "Move netd related file group to the end for...
[automerger skipped] Merge "Move netd related file group to the end for avoiding conflict" am: c97a61b5 am: 0d49fbf9
am: 68834fcc -s ours
Change-Id: I8a978bdcb7db9797cbc65bd5792a9f1f3aea4bc9