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

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

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