[automerger skipped] Merge "Specify version for aidl_interface explicitly" am:...

[automerger skipped] Merge "Specify version for aidl_interface explicitly" am: 85906d7c am: 0636fa9a am: aea5ee48 -s ours am: d4c5bd00 -s ours

am skip reason: Change-Id If0cfdc35f6383a5140d9e4207e15031f8072d066 with SHA-1 830c5007 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1560548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10480525d066d4487dedf0b0befad32f2090074a