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 am: 7aea4bfe am: c7e85ebc

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



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