[automerger skipped] Merge "Add extra key for call attributes." into udc-dev...

[automerger skipped] Merge "Add extra key for call attributes." into udc-dev am: 743eb544 am: 51caaa29 am: f141c8c3 -s ours

am skip reason: Merged-In Ic8b5d57df88cf9c1d8a82a11ad4934ed4ef5fd78 with SHA-1 545b5d83 is already in history

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



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