Merge "Fix isFeatureEnabled namespace and overload usage" am: ab809e5ce0

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

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