Merge "flattened apex: fix clatd mode also for inprocess tethering" am:...

Merge "flattened apex: fix clatd mode also for inprocess tethering" am: 6c0ff3bd am: 27307dda am: 1c428f96

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



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