Merge "Add sepolicy_version to PRODUCT_PACKAGES"