[automerger skipped] Merge changes from topic "c2aidl" am: be80b606 am:...

[automerger skipped] Merge changes from topic "c2aidl" am: be80b606 am: 7ac001eb am: edb54092 -s ours

am skip reason: Merged-In Ia47a5c6a83a7c51b4034c901f6ffc9813d3a6eb3 with SHA-1 4b3e4a9b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2283242



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