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

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

Change-Id: I3e07bc2ae190342f115ce3421e20260a1c6ae4e6