Merge "Prevent hotspot from being affected by the wifi retention feature" into udc-dev am: 511e8b8062 am: a1e53a7178

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

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