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

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

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