Merge "Prevent hotspot from being affected by the wifi retention feature" am: ac7a0e3ee9 am: f9a4202c81 am: 7250ed0ec3 am: 5963d8147f

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

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