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

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

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