[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: 81b8110a -s ours

am skip reason: Merged-In I12595a3abdec8664eb27c5295f9daa8644871218 with SHA-1 89721fc2 is already in history

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

Change-Id: I3c349eeb082198a8215bfb5c60f8e8854d9185d4