Merge "Specify version for aidl_interface explicitly" am: 5968a3906e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4076bf928aa7f335b16aace695099b4aac1b5cff