Merge "Fix isFeatureEnabled namespace and overload usage" am: ab809e5ce0 am: 0d2d13e896 am: 55cd1a81f6 am: 7ce3a0eed9 am: 42337413a8

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

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