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

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

Change-Id: Id8ef321cd7d7f13e79c10e77dfa9cea5c3e6cddd