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

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

Change-Id: I69ea8056a224e8a008879b6963824b6877d4fb54