[automerger skipped] Merge "Specify version for aidl_interface explicitly" am:...

[automerger skipped] Merge "Specify version for aidl_interface explicitly" am: e06165a2 am: 31b2a11b am: 9ed1e9d5 -s ours am: 262643ae -s ours

am skip reason: Change-Id I12595a3abdec8664eb27c5295f9daa8644871218 with SHA-1 89721fc2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1376ff090d20fdc61017a96c14bee37d5c23201d