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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd7b735da71f7beebc7976ae0a3bd33b98b0020c