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: Ibda4b0f058f5a6116cbae61cad053d2cac388c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>