Merge "Added datagramId in satellite datagram apis." into udc-dev am: d45d3d9f am: f2ea78a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/21482589



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