Merge "Specify version for aidl_interface explicitly" am: e06165a251 am: 31b2a11bdf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57ae9a9e6f447da720a2b17162e79f5840a1b7a5