Merge "Fix setup on devices without printflags" into main am: b028a6f264 am: b30ac0cdb1

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

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