Merge "Avoid permitted_packages related build failures in unbundled builds"...

Merge "Avoid permitted_packages related build failures in unbundled builds" am: 393bffee am: 9c0d3f91 am: c024fca3 am: 0cfae1bd

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

Change-Id: Iaf49d4e6f85abef4b4d93cb8623e6eeec712e755