Merge "Install sdk variants in unbundled builds and package uninstallable...

Merge "Install sdk variants in unbundled builds and package uninstallable variants" am: c8ffd27c am: 042f7df6

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2562192



Change-Id: Ica057b1724a577938c59129de8719e8cad4a66a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>