Merge changes from topic "refactor-packagingbase" am: ac38c0bb am:...

Merge changes from topic "refactor-packagingbase" am: ac38c0bb am: ad2c724b am: 314e72ab am: e907043d

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



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