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 am: 4daec2d2

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



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