Merge "Change bp2build converter of module "package"." am: f4776046 am:...

Merge "Change bp2build converter of module "package"." am: f4776046 am: 85524d52 am: 1f83bd2a am: 8624fe96 am: a3059d11 am: 72c6341c

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



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