Merge "Don't generate VNDK phony package" am: 91fe7bc0b1 am: 2f4c911035

Original change: https://android-review.googlesource.com/c/platform/development/+/1328613

Change-Id: I0bd18cc0088d1f3bfaa1aef69eb15115a73828f6