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

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

Change-Id: I583fb79a29d92e52c262c93aef8283ffc36e8b2e