Merge "Add FEATURE_EMBEDDED to PackageManager"