Merge "Telecom: Refactor to move DEVICE_ID_DEFAULT from vdm to Context" into...

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

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



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