Merge "Merge "Add extra key to StreamingCall." into udc-dev am: 6bbc974a am:...

Merge "Merge "Add extra key to StreamingCall." into udc-dev am: 6bbc974a am: 458d9088" into udc-d1-dev-plus-aosp am: dddb8c0b

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



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