Merge changes from topic "isfeatureenabled_onboot" am: addca7cd13

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

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