Merge "Workaround for existing packages check failure when the `generic`...

Merge "Workaround for existing packages check failure when the `generic` product is used with ART prebuilts." am: 40ea7379 am: 1837e64d am: 15d6b176 am: 20ddb0d8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea9fdc82b2d4b9bef04404389f1cb3396bc93ae4