Merge "[automerger skipped] Add comments to frozen netd AIDL API files am:...
Merge "[automerger skipped] Add comments to frozen netd AIDL API files am: 4c3040e6 -s ours am: 95721a06 -s ours am skip reason: change_id I101ffee4045592d51417d3c954c54b2edfdd332d with SHA1 f6ff9b40 is in history" into qt-r1-dev-plus-aosp