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

[automerger skipped] Merge changes from topic "c2aidl" am: ddfaa610 am: 5e7eb160 am: b7b51af1 -s ours

am skip reason: Merged-In Icd6f80dbfff6052042fad0572679555ff42fd928 with SHA-1 61f628c3 is already in history

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



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