Merge "Prevent hotspot from being affected by the wifi retention feature" am: ac7a0e3ee9

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

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