[automerger skipped] Install sdk variants in unbundled builds and package uninstallable variants am: 3d6f3a02f8
am: 9ab0aa0b33
-s ours
am skip reason: Merged-In If5418df3ddbb940bd631caebdf38daa81e71f40e with SHA-1 bd3a16b5e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24086298
Change-Id: Ib8f9e0d495ef0c89df6f300f974d1033ce6e6cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: