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

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



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