Merge changes from topic "isfeatureenabled_onboot" am: addca7cd13 am: 14a76994c0

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

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