Merge "Add extra key for call attributes." into udc-dev am: 743eb544 am:...

Merge "Add extra key for call attributes." into udc-dev am: 743eb544 am: 51caaa29 am: f9e448c0

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



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