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

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

Change-Id: I4a266ef93b2cbadefc4c639c2ed2a3a326147274