Merge "Add instructions on how to annotate an AIDL interface" am: b6df9fb2e8

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

Change-Id: Ibb49b112a88bbd866b5fd32be86a0961fbfa4531