Merge "Revert "Skip packaging cross container cc deps of apk-in-apex"" into...

Merge "Revert "Skip packaging cross container cc deps of apk-in-apex"" into main am: 5c7d9792 am: 5845e634

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3387669



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