[automerger skipped] Merge "Soong package structure refactoring" into rvc-dev...

[automerger skipped] Merge "Soong package structure refactoring" into rvc-dev am: 30167e80 -s ours am: 9985c8cd -s ours

am skip reason: Change-Id I7b00cd344b9f16861f1ff39edf0029f016b853d0 with SHA-1 4b79e98a is in history

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

Change-Id: Ifdcf7ffdac5fff06c48dbbac27a13fd1248390cd