Merge "No need for special case programs for [4.14, 5.4) kernels." am: 7623d8c799 am: c822736ea8

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

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