Merge "Allow packages to be enabled depending on sku value" into main am: 0ba657a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3324768



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