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

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

Change-Id: I68d681bd4257bbf2ae2fae724eb87b70eb8aabcc