Merge "hidl2aidl: note inheritance methods flattened" am: 9862423698 am: 980da91054 am: 36a2f17814 am: 82f722a570

Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2154559

Change-Id: I67d2e28a88a16d6a0d69e659c198d3b59a43e458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>