[automerger skipped] Merge "Specify version for aidl_interface explicitly" am: 5968a3906e am: 8add53a34a am: bd0e762d11 -s ours am: 47f990f6dd -s ours
am skip reason: Change-Id I99a5000109b171a74ac4f604b88e86a87b48ec5f with SHA-1 969b9219b9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560410
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If36249dc7229823e36396fcb3ed43c45b8e8c6cf
This commit is contained in: