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

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

Change-Id: I4dc7ab815927db10648b04de41335753e3ca0c94