Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92

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

Change-Id: Iefbd6fa6a061614b83d115219f8939dee8794bb7