Merge "flattened apex: fix /apex/com.android.tethering/bin/for-system{,/clatd}...

Merge "flattened apex: fix /apex/com.android.tethering/bin/for-system{,/clatd} mode" am: db01225c am: b986bd3a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2528043



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