Merge "Sets deviceId in providers" into udc-dev am: fcd6ff1785

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/22895781

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