Merge changes from topic "colefaust_enforce_product_packages_exist" am:...

Merge changes from topic "colefaust_enforce_product_packages_exist" am: 1be3bddb am: 547767af am: 704d539e am: e7c1d6e5

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



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