[automerger skipped] Merge "Setting callingAttributionSource in getType and getStreamType" into udc-dev am: 9b39adf6 am: e654ec83 -s ours

am skip reason: Merged-In I31d6c7e9786ad187a92a02e707180410a3c875d6 with SHA-1 3ba061af is already in history

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



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