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

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



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