[automerger skipped] Merge "Declare/Use lateststable/tot wrapper for...

[automerger skipped] Merge "Declare/Use lateststable/tot wrapper for aidl_interface" am: f4e96645 am: 260b2ff9 -s ours

am skip reason: Change-Id I35f213729f3d6a2716337b2a3a62a8457e15ef85 with SHA-1 319a544b is in history

Original change: https://android-review.googlesource.com/c/platform/system/netd/+/1593772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife884b523d7472035e669f9007c5330aa2d0dfe9