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

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

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