[automerger skipped] Merge "Remove the dependency of...

[automerger skipped] Merge "Remove the dependency of dnsresolver_aidl_interface-java" am: 9e3abef9 am: 09f0c840 -s ours

am skip reason: Merged-In Id229f68404ddf50a5ed8da800a3dbe8acead2d20 with SHA-1 937595cf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1759249

Change-Id: I407ffb3cc5915bf0737df04255b0e7aa41ff34bf