Merge "Specify version for aidl_interface explicitly" am: 4561d23a6a am: 66783f7bb6 am: 274d92c6a3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad0b9a4fecbf0082a839a7b47fc036acc8a04f9e