Merge "Drop PRODUCT_PACKAGES special-case in source vs prebuilt mainline...

Merge "Drop PRODUCT_PACKAGES special-case in source vs prebuilt mainline selection" into main am: 13045cd3

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



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