Merge "Fix the problem of resource integration confusion caused by not adding...

Merge "Fix the problem of resource integration confusion caused by not adding regional configuration tailoring." into main am: 30f6e282 am: a06b6fc5

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



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