Merge "Ensure airplane mode take effect by checking softap status" am: 1860b17def

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

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