[automerger skipped] Merge "Prevent hotspot from being affected by the wifi retention feature" into udc-dev am: 511e8b8062 -s ours

am skip reason: Merged-In Ic48ba63deab02683280543516228104be928a6a2 with SHA-1 8f49a826ad is already in history

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

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