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

[automerger skipped] Merge "Declare/Use lateststable/tot wrapper for aidl_interface" am: e8850821 am: 233fde4d -s ours am: 0e91980c -s ours am: e970bee2 -s ours

am skip reason: Change-Id If9041a8a5e06afb528cdcc7d6ecd9a65082fc7d1 with SHA-1 aa7664fc is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1593853

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee809aba7c660f2945cdca6a3e622f559983d3fa