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

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

Change-Id: I34ec255664a0f9d31d6173950daf0ea844f8c26a