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

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



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