Merge "Telecom: Refactor to move DEVICE_ID_DEFAULT from vdm to Context" into udc-dev am: fec9fe98

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/21464956



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