Merge "Specify version for aidl_interface explicitly" am: 85906d7cc7 am: 0636fa9a3c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6cec2b0bd41a34c72973eb6d6af10e89153a35c