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

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

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