Merge "Check whether feature is enabled by compare with apex version" into mainline-prod am: 2b5ca309f9

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

Change-Id: If82b0f147e3f26813746e7f3c4df11f605bf4a94