Merge "Specify version for aidl_interface explicitly" into sc-dev am: c9ad4f00 am: fc8ef0c3

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

Change-Id: I00ab69928f9c7c6bb3ef822e49a8daa66fb644cf